merge trunk
authorK. Handa <handa@gnu.org>
Sun, 16 Jun 2013 08:07:46 +0000 (17:07 +0900)
committerK. Handa <handa@gnu.org>
Sun, 16 Jun 2013 08:07:46 +0000 (17:07 +0900)
commit628f3e21a7f323fd01d93401691cf08a8f53c733
treea95dcbc05019bb0a8619ab3bfebaac61151ada13
parent7fbb20afad973ee2e54fb1c9a2ec779c75000d75
parent8cdacb527590c90ad6de1c3c73707793327923e7
merge trunk